iconhelper: Un-duplicate some code
authorTimm Bäder <mail@baedert.org>
Sat, 6 Feb 2016 08:27:00 +0000 (09:27 +0100)
committerTimm Bäder <mail@baedert.org>
Sun, 7 Feb 2016 18:16:26 +0000 (19:16 +0100)
gtk/gtkiconhelper.c

index 73f105f130b809ddcdb08c73bfeb59444e19a9a8..c18080394d3c54bfff5bfe0b0a293cae024fc668 100644 (file)
@@ -478,18 +478,15 @@ ensure_surface_for_gicon (GtkIconHelper    *self,
       symbolic = FALSE;
     }
 
+  surface = gdk_cairo_surface_create_from_pixbuf (destination, scale, gtk_widget_get_window (gtk_css_gadget_get_owner (GTK_CSS_GADGET (self))));
+
   if (!symbolic)
     {
       GtkCssIconEffect icon_effect;
 
-      surface = gdk_cairo_surface_create_from_pixbuf (destination, scale, gtk_widget_get_window (gtk_css_gadget_get_owner (GTK_CSS_GADGET (self))));
       icon_effect = _gtk_css_icon_effect_value_get (gtk_css_style_get_value (style, GTK_CSS_PROPERTY_ICON_EFFECT));
       gtk_css_icon_effect_apply (icon_effect, surface);
     }
-  else
-    {
-      surface = gdk_cairo_surface_create_from_pixbuf (destination, scale, gtk_widget_get_window (gtk_css_gadget_get_owner (GTK_CSS_GADGET (self))));
-    }
   g_object_unref (destination);
 
   return surface;